Updates to make tabbing work (ish) in current browsers some of the time