- improved UI workflow