- Several changes to layout