Improved Class Selection Section