Merge Jess' changes for Index page