navbar development
fixed conflicts