Improve screen min-width calculation