add all updates
fixed map sharing color bug and shape popup bug