Updated Structures and Layout