changes to layout, plus under the hood