Cleanup nav and fix referee viewing/updating