Buttons & some refactoring

- Buttons
- navbar refactoring