Fixed WalshawLayout