updates to layout etc