some more work on ui