Improve printing and small screen support