EST-319: improved layout