Polish nav buttons, revise header per instruction, refactor