Fixes for screen resolution issue