Changes to layout interface