Several fixes to layout to make code conforming.