Added db object to the index controller
Merging front-end updates