Simplify navbar
Add support for rendering of options
Remove old comments
Preliminary support for add handlers
Manual save of pivot model