Added button logic generators