UI: some fixes