Changed navbar layout
merge