Fix issue with toolbar breaking on non-order pages