HiddenMask widget refactored