Final navbar fixes