Additional UI Cleanup