utilityprovider refactoring
modal dialog refactoring
settings refactor