Adding in more layout improvements
Finish layout and routes