Navbar

Merging navbar components including color and icons into master