Updated Layout & Design