Improvements for larger screens