Fix grade picker