Improved interface

Various large and small interface improvements.