Organize the string list. Fix all Lint warnings. Remove extra menu xml files.