Added button generation