Fix cancel button
Fix for single choice (radio button)
Fix remove button