added checkbox and improved templates