Simplified things around the html template