Added Layouts, subscription, and other tidbits