Added fix for screen resize