EZP-22152: Layout changes