Improved enabling / disabling of the remove button