More Classes UI cleanup