added metadata and layout