primary_screen -> first_screen() (nw)
validation fix (nw)