improved pick class screen