Improvements to small screen layout