Tweaks

Added HTML container for output
Put images in a subdirectory
Various small tweaks