Fix design. Fix popup window position
Merge branch 'master' of https://github.com/hqt/HopAmChuan