finish redesgin
Merge pull request #23 from rw1993/master

finish redesgin