Fixed layout.
More work on property name changing.