Upgraded HTML layout