fixnested branch

This is an investigation into fixing the broken nested form timelogs with a review from @azach .