Merge fixes on layout