UI Fix
Merge branch 'finaltest' of https://github.com/gaohao/peernet-client into finaltest