Added new tab index for easier tabing through
Took another stab at the template issue