Added index and cleaned up routes
Fixing stuff for merge