Fixed text of invitation mail
Refactored Settings module