More C++ Changes, UI to use ModernUI