Timesheet nested form and minor fixes