Better handling of screen size