configuration, refactoring and UI features