Fixed timeslot as well as some minor localization issues
Merge pull request #39 from Geraldlim91/bugfix

Fixed timeslot as well as some minor localization issues