Add links to various pages, fix routes
Fix merge conflicts
Prettify home