Added all contacts switch
Resource naming changes
Fixed message counter