Cleaned up naming and session checks in index route
Merge