Added navbar tests.
Messing with color schemes.
More color changes. Navbar to buttons.
Small changes.
Merge branch 'dev' into navbar