Re-did image housing, cleaned up some JS