Improve layout and make links functional
Finish layout and routes