finished grades drop-down
settled merge conflicts
Clean-up