[Kali] Fixed map layout