WalshawLayout fixes