Merge rollup, added calendar tpl, moved message output, fixed email address link