Changed layout and routes, fixed links
Finish layout and routes