Updated static layout