UX Reformat

Changed sidebar, merged pages into dashboard.