added edit and remove functionality