Added some tabindex's