More Flask-ifying of HTML
Merge