Merge pull request #1700 from pjackson28/master

Corrected tabbed interface bugs that prevented links nested in the tab panel from working
Added role='toolbar' the map button container and role='button' and aria-label to the map buttons.