Ben

Clean up templates and app.py functions