fix error with modal popup
minor changes
Merge pull request #110 from baoducng/feat/marcopoloTabImprovement

Feat/marcopolo tab improvement