Fixed the screen size issue, although its not as pretty as it could be