Mega consolidation and merge into old layout