Changed New and Remove buttons