more initial changes to layout (far from done…)