added layout
added layout
moved navbar code
moved navbar code2
moved navbar