cleaned up templates for expanding databinding