* Revert recent commits * Move things around, and do preparation work for nested page systems. * Fixed issue on side bar not appearing