Various updates to layout.