Add handler for cancel
add fake values for testing
Fix choice selection