logo avoid strech and location remove scope condition