More fixes [Hopefully now it won't break as much on small displays]