More optimization

more screen fixing