Make UI elements public for better customization.
Merge branch 'develop'