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/Popup.vue

@@ -32,6 +32,7 @@ export default {
   opacity: 0.6;
   overflow-x: hidden;
 }
+
 .popup-body {
   position: fixed;
   top: 50%;