Further minor changes like html titles and image storage
Further minor changes like html titles and image storage (2)