Improvements to screen layout