Some improvement for customer interface