Cleaning up layout
Finish layout and routes