Classification UI Improvements