Merge pull request #5 from edwardzhou/ruitong

Change UI layout
modify UI
Merge pull request #21 from jeffcao/ruitong

modify UI