Fix order in which properties are rendered