refactoring, ui changes, alert dialogs