Added Save and Remove buttons