fixed the controllers and navigation