Improved class selection screen