Moved all strings to XML + removed duplication