Some more work on the user interface