Fix bugs, add scaling to screen size

- scaling to screen size
- stylistic fixes