Updated Layout Code