Small refactorings
Add bottom bar