more changes
Finish layout and routes