diff --git a/src/pages/About.vue b/src/pages/AboutPage.vue
similarity index 100%
rename from src/pages/About.vue
rename to src/pages/AboutPage.vue
diff --git a/src/pages/Auth.vue b/src/pages/AuthPage.vue
similarity index 100%
rename from src/pages/Auth.vue
rename to src/pages/AuthPage.vue
diff --git a/src/pages/Board.vue b/src/pages/BoardPage.vue
similarity index 100%
rename from src/pages/Board.vue
rename to src/pages/BoardPage.vue
diff --git a/src/pages/Profile/EditProfile.vue b/src/pages/EditProfilePage.vue
similarity index 100%
rename from src/pages/Profile/EditProfile.vue
rename to src/pages/EditProfilePage.vue
diff --git a/src/pages/Home.vue b/src/pages/HomePage.vue
similarity index 100%
rename from src/pages/Home.vue
rename to src/pages/HomePage.vue
diff --git a/src/pages/NotFound.vue b/src/pages/NotFoundPage.vue
similarity index 100%
rename from src/pages/NotFound.vue
rename to src/pages/NotFoundPage.vue
diff --git a/src/pages/Notes.vue b/src/pages/NotesPage.vue
similarity index 100%
rename from src/pages/Notes.vue
rename to src/pages/NotesPage.vue
diff --git a/src/pages/Profile.vue b/src/pages/ProfilePage.vue
similarity index 100%
rename from src/pages/Profile.vue
rename to src/pages/ProfilePage.vue
diff --git a/src/pages/ProfilesPage.vue b/src/pages/ProfilesPage.vue
index 7d3f553f..efb3fc99 100644
--- a/src/pages/ProfilesPage.vue
+++ b/src/pages/ProfilesPage.vue
@@ -10,7 +10,8 @@
       v-for="profile in profiles"
       :key="profile.userName"
     >
-      <small>{{ profile.userName }}</small>
+      <img :src="profile.profileImage" :alt="profile.userName" width="50">
+      <small>{{ `@${profile.userName}` }}</small>
     </router-link>
   </b-container>
 </template>
diff --git a/src/pages/PublicBoards.vue b/src/pages/PublicBoardsPage.vue
similarity index 100%
rename from src/pages/PublicBoards.vue
rename to src/pages/PublicBoardsPage.vue
diff --git a/src/pages/PublicProfile.vue b/src/pages/PublicProfile.vue
deleted file mode 100644
index 96a964e9..00000000
--- a/src/pages/PublicProfile.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template lang="html">
-  <div>
-    <pre>{{ userName }}</pre>
-    <b-alert show variant="danger" v-if="error">
-      user not found
-    </b-alert>
-
-    <pre class="bg-info">{{ profile }}</pre>
-    <!-- TODO: load profile and display it -->
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      error: false,
-      profile: null,
-    };
-  },
-  computed: {
-    userName() {
-      return this.$route.params.userName;
-    },
-  },
-
-  mounted() {
-    this.load();
-  },
-
-  methods: {
-    load() {
-      this.$store.dispatch('LOAD_PUBLIC_PROFILE', this.userName)
-        .then((data) => {
-          this.profile = data;
-        })
-        .catch(() => {
-          this.error = true;
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" rel="stylesheet/scss" scoped>
-</style>
-
diff --git a/src/pages/PublicProfilePage.vue b/src/pages/PublicProfilePage.vue
new file mode 100644
index 00000000..fa8dd5e4
--- /dev/null
+++ b/src/pages/PublicProfilePage.vue
@@ -0,0 +1,114 @@
+<template lang="html">
+  <b-container>
+    <div v-if="loading">
+      Loading...
+    </div>
+
+    <template v-else-if="profile">
+      <div>
+        <img :src="profile.profileImage" :alt="userName" class="rounded" />
+
+        <h2>{{ profile.userName }}</h2>
+      </div>
+
+      <b-button v-if="canEdit" :to="{ name: 'profile' }">
+        Edit
+      </b-button>
+
+      <mini-board
+        v-for="board in userBoards"
+        :key="board.id"
+        :board="board"
+        @view-board="viewPublicBoard(board.id)"
+        class="p-relative"
+      />
+    </template>
+
+    <empty-state
+      v-else
+      title="404 Not Found"
+      message="Page not found!"
+    />
+  </b-container>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import MiniBoard from '@/components/Board/MiniBoard';
+import EmptyState from '@/components/EmptyState';
+
+export default {
+  components: {
+    MiniBoard,
+    EmptyState,
+  },
+
+  data() {
+    return {
+      error: false,
+      loading: false,
+      userBoards: [],
+      profile: null,
+    };
+  },
+
+  computed: {
+    ...mapState(['user']),
+
+    canEdit() {
+      return this.profile && this.profile.userId
+        ? this.user && this.user.uid === this.profile.userId
+        : false;
+    },
+
+    userName() {
+      return this.$route.params.userName;
+    },
+  },
+
+  watch: {
+    userName(value) {
+      if (value) {
+        this.loadProfile();
+      }
+    },
+  },
+
+  mounted() {
+    this.loadProfile();
+  },
+
+  methods: {
+    viewPublicBoard(id) {
+      this.$router.push({ name: 'public-board', params: { id } });
+    },
+
+    async loadProfile() {
+      this.error = false;
+      this.loading = true;
+
+      this.profile = await this.$store.dispatch('LOAD_PUBLIC_PROFILE', this.userName)
+        .catch(() => {
+          this.error = true;
+        });
+
+      if (!this.profile) {
+        this.loading = false;
+
+        return;
+      }
+
+      this.userBoards = await this.$store.dispatch('LOAD_USER_PUBLIC_BOARDS', this.profile.userId)
+        .catch(() => {
+          this.error = true;
+        });
+
+      this.loading = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" rel="stylesheet/scss" scoped>
+</style>
+
diff --git a/src/pages/Releases.vue b/src/pages/ReleasesPage.vue
similarity index 100%
rename from src/pages/Releases.vue
rename to src/pages/ReleasesPage.vue
diff --git a/src/pages/Settings.vue b/src/pages/SettingsPage.vue
similarity index 100%
rename from src/pages/Settings.vue
rename to src/pages/SettingsPage.vue
diff --git a/src/pages/Tags.vue b/src/pages/TagsPage.vue
similarity index 100%
rename from src/pages/Tags.vue
rename to src/pages/TagsPage.vue
diff --git a/src/pages/Wallpapers.vue b/src/pages/WallpapersPage.vue
similarity index 100%
rename from src/pages/Wallpapers.vue
rename to src/pages/WallpapersPage.vue
diff --git a/src/router.js b/src/router.js
index fe7510d7..ee4cc797 100755
--- a/src/router.js
+++ b/src/router.js
@@ -1,25 +1,26 @@
 import Vue from 'vue';
 import Router from 'vue-router';
-import Board from '@/pages/Board';
-import About from '@/pages/About';
-import Wallpapers from '@/pages/Wallpapers';
-import PublicBoards from '@/pages/PublicBoards';
-import Tags from '@/pages/Tags';
-import Notes from '@/pages/Notes';
-import Releases from '@/pages/Releases';
-import Auth from '@/pages/Auth';
+import BoardPage from '@/pages/BoardPage';
+import AboutPage from '@/pages/AboutPage';
+import WallpapersPage from '@/pages/WallpapersPage';
+import PublicBoardsPage from '@/pages/PublicBoardsPage';
+import TagsPage from '@/pages/TagsPage';
+import NotesPage from '@/pages/NotesPage';
+import ReleasesPage from '@/pages/ReleasesPage';
+import AuthPage from '@/pages/AuthPage';
 import BoardsPage from '@/pages/BoardsPage';
 import ProfilesPage from '@/pages/ProfilesPage';
 import DevToolsPage from '@/pages/DevToolsPage';
-import Home from '@/pages/Home';
-import Settings from '@/pages/Settings';
-import Profile from '@/pages/Profile';
-import EditProfile from '@/pages/Profile/EditProfile';
-import PublicProfile from '@/pages/PublicProfile';
+import HomePage from '@/pages/HomePage';
+import SettingsPage from '@/pages/SettingsPage';
+import ProfilePage from '@/pages/ProfilePage';
+import EditProfilePage from '@/pages/EditProfilePage';
+import PublicProfilePage from '@/pages/PublicProfilePage';
 
 Vue.use(Router);
 
 export default new Router({
+  mode: 'history',
   routes: [
     {
       name: 'boards',
@@ -35,12 +36,13 @@ export default new Router({
       component: ProfilesPage,
       meta: {
         title: 'Boards',
+        public: true,
       },
     },
     {
       name: 'home',
       path: '/',
-      component: Home,
+      component: HomePage,
       meta: {
         title: 'Home',
       },
@@ -56,7 +58,7 @@ export default new Router({
     {
       name: 'settings',
       path: '/settings',
-      component: Settings,
+      component: SettingsPage,
       meta: {
         title: 'Settings',
       },
@@ -64,7 +66,7 @@ export default new Router({
     {
       name: 'wallpapers',
       path: '/wallpapers',
-      component: Wallpapers,
+      component: WallpapersPage,
       meta: {
         title: 'Wallpapers',
       },
@@ -72,7 +74,7 @@ export default new Router({
     {
       name: 'tags',
       path: '/tags',
-      component: Tags,
+      component: TagsPage,
       meta: {
         title: 'Tags',
       },
@@ -80,7 +82,7 @@ export default new Router({
     {
       name: 'notes',
       path: '/notes',
-      component: Notes,
+      component: NotesPage,
       meta: {
         title: 'Notes',
       },
@@ -88,7 +90,7 @@ export default new Router({
     {
       name: 'public-boards',
       path: '/public-boards',
-      component: PublicBoards,
+      component: PublicBoardsPage,
       meta: {
         title: 'PublicBoards',
         public: true,
@@ -97,15 +99,15 @@ export default new Router({
     {
       name: 'profile',
       path: '/profile',
-      component: Profile,
+      component: ProfilePage,
       meta: {
         title: 'Profile',
       },
     },
     {
       name: 'edit-profile',
-      path: '/profile/edit',
-      component: EditProfile,
+      path: '/EditProfilePage',
+      component: EditProfilePage,
       meta: {
         title: 'Edit profile',
       },
@@ -113,7 +115,7 @@ export default new Router({
     {
       name: 'about',
       path: '/about',
-      component: About,
+      component: AboutPage,
       meta: {
         title: 'About',
       },
@@ -121,7 +123,7 @@ export default new Router({
     {
       name: 'releases',
       path: '/releases',
-      component: Releases,
+      component: ReleasesPage,
       meta: {
         title: 'Releases',
       },
@@ -129,7 +131,7 @@ export default new Router({
     {
       name: 'auth',
       path: '/auth',
-      component: Auth,
+      component: AuthPage,
       meta: {
         title: 'Auth',
       },
@@ -137,19 +139,19 @@ export default new Router({
         {
           name: 'auth-provider',
           path: ':provider',
-          component: Auth,
+          component: AuthPage,
         },
       ],
     },
     {
       path: '/board/:id',
       name: 'board',
-      component: Board,
+      component: BoardPage,
     },
     {
       path: '/b/:id',
       name: 'public-board',
-      component: Board,
+      component: BoardPage,
       meta: {
         public: true,
       },
@@ -157,7 +159,7 @@ export default new Router({
     {
       path: '/:userName',
       name: 'public-profile',
-      component: PublicProfile,
+      component: PublicProfilePage,
       meta: {
         public: true,
       },