Cleaned up HTML templates

Templates were a little hard to read before, hope this helps the next person to come along.