In progress: top bar refactor