Pull request for the ModernUI changes

Dear Igor,

Please do the pull.