[#84]Move strings from layouts to strings.xml and rename some for
consistency