More small style changes, separated two offer types in templates