UI experiments, refactoring