Still trying layout changes.
Don't restart on speed change.