Merge "fix the layout oddness that occurrs in portrait mode"