updates
some changes
Finish layout and routes