Fixed wrapping issues with the btn class

Fixes #4454
Merge pull request #5716 from pjackson28/fixbuttonwrapping

Fixed wrapping issues with the btn class