Template elements now have corresponding classes
Added image context