Layout refactor (#150)

* Revert recent commits

* Move things around, and do preparation work for nested page systems.

* Fixed issue on side bar not appearing

components/ui/ConfirmPopup.vue

@@ -35,13 +35,8 @@
 </template>
 
 <script>
-import Popup from '~/components/ui/Popup'
-
 export default {
   name: 'ConfirmPopup',
-  components: {
-    Popup,
-  },
   props: {
     confirmationText: {
       type: String,