Minor UI enhancements

Refers to #111