UI modified
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
refactor codes
Merge pull request #100 from SupunS/master

refactor codes