Feature/modal navigation changes

Fixed modal TAB navigation for all modals.