Templates fixed (I'm an idiot btw). Modals working.
Cleaned up all files for consistancy. Email modal working better.
Merge branch 'feature/modals' into develop