Finally have the nav bar looking relatively good