Cleaned up excess templates, added login boilerplate