clean up UI for LOP. #3861