Fix active menu, changed route names