Correct Tab order to allow keyboard navigation