Merge "Print UI tweaks." into klp-dev