Possibility to remove 'htmlPreview' - small code and style fixes