fix strings.xml; cleanup metadata layout a little