improve screen hooks