more work on the UI