Some UI Corrections