UI: More fixes