Added better scaling for both smaller and larger screens