Fix position of close button on small screens
The call order of _scale() and _scaleLower() is now respected
Merge branch 'fix-closebutton-positon-on-small-screens'

Conflicts:
	CHANGELOG.md