ongoing refactoring. More UI neutralization.