Fixing tab ordering