[VP,TP] layout fix