962 map shifting tabs fix

closes #962. No straightforward way to remove the tabindex (short-term fix), but have changed the container positions to keep the tabs from shifting