Merge pull request #6 from edwardzhou/ruitong_ui

Change UI layout
modify UI
Merge pull request #22 from jeffcao/ruitong_ui

modify UI