Updated layout + Model Data Attributes