General Touchups

Fixing navigation on all pages