Rearrange layout to match other classes.