Updated Layout Design