Print UI Improvements

Fixes #500 and adds tests a la #569