Continued with images, some CSS clean-up