Made multiple changes to different parts of the system.
Changed colour of nav-bar
Fixed conflicts and chnaged colour of nav-bar