This will also work better for when the title makes the buttons drop down a new line

Closes #14228