some cleanup work on th UI classes