Time entries edit, bugs fix