Cleanup and reorganize html templates