Fixed more stuff
Fixed screen width references