Acc v1.2

Accessibility focus fix to prevent page jumping between tabbing.