Streamlined tab orders, added bnr