Merge "Print UI tweaks as per UX request." into klp-dev