Cleanup and fix of default assignments.
More default assigments. Minor fix of layout.