Started splitting up the pages into different views

Sorta works