Moved hard-coded strings to resources
Reformatted spaces to tabs