Edit: Factor/To do/UI

Describe this revision: