ensure button type

BS3 commit 6307dc4
Outline fix

BS3 commit bae9d8a