More work on the user interface.