Added Edit and Remove