Updated layout helper
Finished layout and routes