[ui] Simplify ui a bit