Moved modals into their own templates
Tweaked layout for better footer