OE-3255 - Fixed layout data elements