Merging 2.5" layout changes