Merge pull request #99 from baoducng/refact/controller

Refact/controller
Merge pull request #108 from baoducng/feat/marcopoloTabImprovement

Feat/marcopolo tab improvement
fix error with modal popup
minor changes