Refactoring,

Better location updates
More adds.
Moving texts to strings.xml