revised fixes for ui-upgrade.html, added ui-upgrade2.html