#315 Improving user interaction when setting revenue model