Removed the set assignment time from the assignment screen and instead added it to the preference screen.  Also did a tad if some code clean up.