Fixed remove btn