Update alert message and fix the logic
Merge branch 'master' of https://github.com/tienwei/oddsAre-UI-Polishing