added removal buttons and updated management form