added ability to remove quote via 'remove' button and fixed problems caused by context/closure