some UI updates in zg update
Merge branch 'develop'