Layout tweak, better deploy