Fixed add-order buttons behaviour