Adding appropriate remove buttons