Updated to allow css and images, as well as some other minor adjustments