Updated to the new ModernUI