* Improve right-angle layout and prefer Kai spacing