Use a row layout rather than a column layout
Remove a bunch of dead code.