Clean up
Made modals into templates