Added flag to disable button stacking if wanted