Fixed the time entry table
Fixed some bug and recaftored the task model