More aspect ratio tweaking (thanks @murkle)