Introduce toolbars in views
Code formatting
Refactoring