Refactored, more images, Twitter markup on homepage