Made some UI Fixes
Added Some UI Fixes