More updates.
Removed the index route
Merge branch 'westhouse'