Improved scaling, should scale much better on different sized devices
now