Some work on the user interface