Better support for different screen sizes