Merge "fix close button style/layout"