focusing problems solved. settings popover replaced with a modal