diff --git a/src/components/base/BaseLayout.vue b/src/components/base/BaseLayout.vue
index ba62017..0ea329a 100644
--- a/src/components/base/BaseLayout.vue
+++ b/src/components/base/BaseLayout.vue
@@ -1,8 +1,11 @@
 <template>
     <ion-page>
-        <ion-header>
+        <ion-header collapse="fade">
             <ion-toolbar>
-                <ion-img slot="start" :src="tainacanLogo" class="header__tainacan-logo" />
+                <ion-buttons slot="start">
+                    <ion-back-button :default-href="pageDefaultBackLink"></ion-back-button>
+                </ion-buttons>
+                <ion-img :src="tainacanLogo" class="header__tainacan-logo" />
                 <ion-buttons slot="end">
                     <ion-button @click="logOff" aria-label="Sair">
                         <ion-icon slot="icon-only" :icon="logOutOutline"></ion-icon>
@@ -10,13 +13,10 @@
                 </ion-buttons>
             </ion-toolbar>
             <ion-toolbar>
-                <ion-buttons slot="start">
-                    <ion-back-button :default-href="pageDefaultBackLink"></ion-back-button>
-                </ion-buttons>
-                <ion-title> {{ pageTitle }} </ion-title>
+                <ion-title size="small"> {{ pageTitle }} </ion-title>
             </ion-toolbar>
         </ion-header>
-        <ion-content>
+        <ion-content fullscreen="true">
             <slot />
         </ion-content>
     </ion-page>
diff --git a/src/components/CollectionList.vue b/src/components/lists/CollectionsList.vue
similarity index 90%
rename from src/components/CollectionList.vue
rename to src/components/lists/CollectionsList.vue
index 14ae9a3..7b0b993 100644
--- a/src/components/CollectionList.vue
+++ b/src/components/lists/CollectionsList.vue
@@ -28,7 +28,7 @@ export default {
         IonLabel,
     },
     setup() {
-        const image = computed (() => require('../assets/placeholder_square_small.png'))
+        const image = computed (() => require('../../assets/placeholder_square_small.png'))
         return { image }
     },
 }
diff --git a/src/components/ItemList.vue b/src/components/lists/ItemsList.vue
similarity index 96%
rename from src/components/ItemList.vue
rename to src/components/lists/ItemsList.vue
index 5a16030..0e0c2bb 100644
--- a/src/components/ItemList.vue
+++ b/src/components/lists/ItemsList.vue
@@ -16,7 +16,7 @@
 <script lang="ts">
 import {
     useCollectionsStore
-} from '../store/storeCollection';
+} from '../../store/storeCollection';
 import {
     IonCard,
     IonLoading,
diff --git a/src/main.ts b/src/main.ts
index c55d385..1c42088 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,8 +2,8 @@ import { createApp } from 'vue'
 
 import App from './App.vue'
 import BaseLayout from './components/base/BaseLayout.vue';
-import CollectionList from './components/CollectionList.vue';
-import ItemList from './components/ItemList.vue';
+import CollectionList from './components/lists/CollectionsList.vue';
+import ItemList from './components/lists/ItemsList.vue';
 import router from './router';
 import { createPinia } from 'pinia';
 
diff --git a/src/pages/ItemsByCollection.vue b/src/pages/CollectionPage.vue
similarity index 100%
rename from src/pages/ItemsByCollection.vue
rename to src/pages/CollectionPage.vue
diff --git a/src/pages/ColletionsFull.vue b/src/pages/CollectionsPage.vue
similarity index 84%
rename from src/pages/ColletionsFull.vue
rename to src/pages/CollectionsPage.vue
index c94ee65..82de506 100644
--- a/src/pages/ColletionsFull.vue
+++ b/src/pages/CollectionsPage.vue
@@ -9,13 +9,13 @@
             <ion-list-header>
                 Coleções
             </ion-list-header>
-            <collection-list :collections="collectionStore.collections"></collection-list>
+            <collections-list :collections="collectionStore.collections"></collections-list>
         </ion-list>
     </base-layout>
 </template>
 
 <script>
-import CollectionList from '@/components/CollectionList.vue';
+import CollectionsList from '@/components/lists/CollectionsList.vue';
 import BaseLayout from '@/components/base/BaseLayout.vue';
 import { IonLoading, IonListHeader, IonList } from '@ionic/vue';
 
@@ -27,7 +27,7 @@ import { ref } from 'vue';
 
 export default {
     components: {
-        CollectionList,
+        CollectionsList,
         BaseLayout,
         IonLoading,
         IonList,
diff --git a/src/pages/HomeView.vue b/src/pages/HomePage.vue
similarity index 82%
rename from src/pages/HomeView.vue
rename to src/pages/HomePage.vue
index 95d473d..102574f 100644
--- a/src/pages/HomeView.vue
+++ b/src/pages/HomePage.vue
@@ -9,17 +9,17 @@
             <ion-list-header>
                 Coleções
             </ion-list-header>
-            <collection-list :collections="collectionStore.collections"></collection-list>
+            <collections-list :collections="collectionStore.collections"></collections-list>
         </ion-list>
-        <ion-button fill="clear" size="small" routerLink="/collectionsfull">
+        <ion-button fill="clear" size="small" routerLink="/collections">
             Acessar lista completa de coleções
         </ion-button>
         <ion-list>
             <ion-list-header>
                 Items
             </ion-list-header>
-            <item-list></item-list>
-            <ion-button fill="clear" size="small" routerLink="/itemsfull">
+            <items-list></items-list>
+            <ion-button fill="clear" size="small" routerLink="/items">
                 Acessar lista completa de itens
             </ion-button>
         </ion-list>
@@ -27,8 +27,8 @@
 </template>
 
 <script>
-import CollectionList from '@/components/CollectionList.vue';
-import ItemList from '@/components/ItemList.vue';
+import CollectionsList from '@/components/lists/CollectionsList.vue';
+import ItemsList from '@/components/lists/ItemsList.vue';
 import BaseLayout from '@/components/base/BaseLayout.vue';
 
 import {
@@ -46,8 +46,8 @@ import { ref } from 'vue';
 
 export default {
     components: {
-        CollectionList,
-        ItemList,
+        CollectionsList,
+        ItemsList,
         BaseLayout,
         IonList,
         IonListHeader,
diff --git a/src/pages/ItemsFull.vue b/src/pages/ItemsPage.vue
similarity index 100%
rename from src/pages/ItemsFull.vue
rename to src/pages/ItemsPage.vue
diff --git a/src/pages/LoginForm.vue b/src/pages/LoginPage.vue
similarity index 99%
rename from src/pages/LoginForm.vue
rename to src/pages/LoginPage.vue
index 42f7604..47595ee 100644
--- a/src/pages/LoginForm.vue
+++ b/src/pages/LoginPage.vue
@@ -117,7 +117,7 @@ export default {
             // this.collectionStore.siteUrl = this.siteUrl;
             // this.collectionStore.userLogin = this.userLogin;
             // this.collectionStore.userPassword = this.userPassword;
-            this.$router.push('/homeview');
+            this.$router.push('/home');
         }
     }
 
diff --git a/src/pages/AdminWebView.vue b/src/pages/WebPage.vue
similarity index 100%
rename from src/pages/AdminWebView.vue
rename to src/pages/WebPage.vue
diff --git a/src/router/index.ts b/src/router/index.ts
index 5037bb9..d0eeace 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,41 +2,41 @@ import { createRouter, createWebHistory } from '@ionic/vue-router';
 import { RouteRecordRaw } from 'vue-router';
 import { useUserStore } from '../store/storeUser'
 
-import HomeView from '../pages/HomeView.vue';
-import LoginForm from '../pages/LoginForm.vue';
-import ItemsByCollection  from '../pages/ItemsByCollection.vue';
-import CollectionsFull from '../pages/ColletionsFull.vue';
-import ItemsFull from '../pages/ItemsFull.vue';
+import HomePage from '../pages/HomePage.vue';
+import LoginPage from '../pages/LoginPage.vue';
+import CollectionPage  from '../pages/CollectionPage.vue';
+import CollectionsPage from '../pages/CollectionsPage.vue';
+import ItemsPage from '../pages/ItemsPage.vue';
 
 const routes: Array<RouteRecordRaw> = [
   {
     path: '/',
-    redirect: '/homeview'
+    redirect: '/home'
   },
   {
-    path: '/homeview',
-    component: HomeView,
-    name: 'homeview'
+    path: '/home',
+    component: HomePage,
+    name: 'home'
   },
   {
-    path: '/loginform',
-    component: LoginForm,
-    name: 'loginform'
+    path: '/login',
+    component: LoginPage,
+    name: 'login'
   },
   {
-    path: '/itemsbycollection/:id',
-    component: ItemsByCollection,
-    name: 'itemsbycollection'
+    path: '/collections/:id',
+    component: CollectionPage,
+    name: 'collection'
   },
   {
-    path: '/collectionsfull',
-    component: CollectionsFull,
-    name: 'collectionsfull'
+    path: '/collections',
+    component: CollectionsPage,
+    name: 'collections'
   },
   {
-    path: '/itemsfull',
-    component: ItemsFull,
-    name: 'itemsfull'
+    path: '/items',
+    component: ItemsPage,
+    name: 'items'
   }
 ]
 
@@ -48,7 +48,7 @@ const router = createRouter({
 router.beforeEach(async(to, from, next) => {
   const userStore = useUserStore();
   await userStore.checkUserLogin();
-  if (to.name !== 'loginform' && !userStore.userIsLoggedIn) next({ name: 'loginform' })
+  if (to.name !== 'login' && !userStore.userIsLoggedIn) next({ name: 'login' })
   else next()
 })