some fixes in screens