Further small screen tweaks and thresholds