Improving XLSForm template