added remove btn logic