Add add/remove to ui. Fix types header.