Cleanup and improvements; hide "add" controls when done