Changes to layout, controls and data