Changed navbar generation slightly