EST-410: Fix identity; rename maximumAmount to contractualAmount; fix layout