Navigation sorted

New active state - cleaner looking