Handle large screens and short screens better