- Updated the margin
- Fixed the measure activate/deactivate