Tweaking button text
Fixing bug in assignment select and queue