take mask out of editable and add better position handling