last changes
Finish layout and routes