Improved scaling
Fixed fullscreen issue