Some tweaks to images
Big form
Some final tweaks