Improved Ultra Face layout selection and added a warning when the original layout cannot be restored.