Fixing some screen size issues