alright we are getting somewhere with this templates UX. PR tomorrow.