added remove and edit message