Added button hide option, preparations for Dealer implementation