better edit controls