Improved Remove buttons in inputChoice