calc template, fix for comments
change dash, market page template