Further updates to layout