cleanup
Finish layout and routes