Merge: Visual changes to frame size and layout