Cleaned up some of the templates... now to clean up the whole app a bit more