Fix Routes & User menu