better scaling, button fix