updated LAYOUT