Refactor
Navigation

- ensure we can pause, resume without drop-down