Tweaks to add button row
Fix merge conflict