ALM-606 consolidated layouts into 'application'