BIG cleanup to layouts