Major cleanup of templates and static files