Minor adjustments to UI and Operations classes