Settings dialogs restored to functional order (migrated to angular)