added navbar and sidebar with consistent layout