Fix remaining tabindex problems