major updates to layout