Committing Wegra Lee's all code changes.
There are issues that the app crashes on many cases. We need to fix all
the issues.