couple of user interface improvements