Merge pull request #1237 from bradymiller/zbig01-changes-ui_1