Tweaks to Classes UI