Latest changes after UI cleanup