minor UI enhancements & fixed a NPE