Subs ajax2

Fixes and refinements to header and navbar to make them simpler to maintain and modify.