Issues 3616 3617 focus

@6a68 - yo man, at one point you reviewed a PR that I did to help focus the correct element, esp with IE8. I have taken another stab at this, fixing problems on several fronts, but want to get your feedback!