more work on Organize UI