added focusTrap to handle obscure focus issues