Refactor routes to remove nested routes
Edit screen for single question