Merge Jess' changes for Index page
Merge pull request #63 from hamberguesa/fix_bugs

Merge Jess' changes for Index page