Isolate the generic ui code
Checkpoint