Fixed map, fixed home images
Merge branch 'sgchanges'