Fix overflow, Add #custom-buttons compatibility
Merge branch 'chatbuttons'