Fixed several screen size issues