Improve gradepicker and some other fixes