UI and print enhancements
Added treatments