Major changes to layout.