Further Improvements

Added @string/ to the menu-->main.xml + some additional refactoring