Re-added util.ui
Merge branch 'development'