Tighten up inspector layouts