Add Edit and Remove Function