Fixed tab & moved xdata