navbar css remodified 2
Merge branch 'ui' into development