Renamed servings to layout and other tweaks after run through