some more work on UI