Added some helper stuff
Finish layout and routes