Fixed bugs
Update layout for navbar, side bar