Tweaks to improve small screen sizes