AUI-1646 Layout builder
AUI-1646 Source formatting