Top bar refactoring