code refactor
refactoring UI code
Merge branch 'master' of https://github.com/upul/product-ml