merge timesheet fixes

fixes timesheet rendering problems