Adjustment to form columns, and also height and width of some of the elements. In addition, some elements renamed.