Issue #913 - More UI update issues #913