fixed some screen related issures