Updated with nested layout