Wouldn't mind the layout being stored as a slug + sent as a slug either, though that's annoying to re-work.