Fixing minor issues in the tenant forms