changes to various
Finish layout and routes