added navbar, cohesive layout