Refactored form + other
Merge branch 'master' of github.com:xexiu/sample_app