added removal feature and placeholder for edit