Add timeslot glyphicon, tidy up logic