Change layouts, add d&f