Changes to routes to fix bug and removed onStart