Change Picker

Shorter option titles and added support for semesters.
Merge remote-tracking branch 'origin/master'