Use resources file instead of Constants class
Tweaks
Manual merge of pull request #8