New Map form styling
merge conflict