Adds a new method to deal with the extra buttons.
Fixed merge conflict.
Fix merge conflict.