colors and nav bar changed
second commit