AUI-1646 Layout