improved gui design ...
Merge branch 'master' of https://github.com/littleant/swa