Added resetonrevisit, display as image and fix for full vs left/right layout