UPDATED LAYOUT