Updated Layout usage