Fix SubEntity layout