This version fixes possible hangs and improves UI in settings menus