Updated markup, moar images, latest layout changes