Updated some templates, made a calculations page