CLI UI improvements. Fixes #9 and Fixes #7.