Preferences screen, added working time period
Conflict resolved