Improvements for small viewports