fix the ui bug
Merge branch 'master' of github.com:HellMagic/x-mothership