Improvements of checkout choices admin