fix buttons
remove input mask as requirement
cleanup code
add apply match for level 4