Add links to the top bar
Cleanup some pages
Cleanup