overhaul question templates, adds images