More refactoring to get rid of additional .UI classes entirely.