tidying up + minor navbar improvements