end of screen fixes