Some layout definitions corrections.