Re-arranged buttons, added delete buttons

1 delete whole funnel button, and 1 delete template from list button
(still needs to delete the template).