Images to index
Merge Eric's branch with front end branch