Fix remove button visibility bug