css navbar remodified 3
Merge branch 'ui' into development