Still more work on UI manager classes