Changes to layout & improved