Fixed some incorrect tab orderings