Layout File Structure Updated