UI tweaks to each data template