Upgrade to Wonder button and action
Fixed city error
Merge pull request #60 from Databean/cp_UI2

Upgrade to Wonder button and action