Template tweaks and delete option