Pull request for the ModernUI changes part-2