Simplify UI flow