Fix UI issues
Fix UI issues