Fixed remove Button