timesheet fix
merge from dev
fix the _layout