Upgraded Layout