Back at it. Remove extraneous stuff, tweak layout.