Refactoring again

1. Pass accountid to facade
2. Changed wording to Thai