Changes to layout and control