UI Fixes
fixed edit