large updates to layout