added focus directive, fixed modals