updated some navbar variable names