UI fix: price calculation for templates
Merge remote-tracking branch 'origin/master'