Optimisied image loading

Plus other minor tweaks. Ready for WP deployment & content import