Refactored even more UI code out of ClientCore