update(Helper): Updates to visual components and masking