cleaned up merge so page layouts are consistent'