[Kali] Layout fixes