Experiment in refactoring ui