Many adjustments to layout and panels