Navbar refactoring
Add fluid layout
Add setting bundle, remove option facade