Some cleanup and adding links to navbar