Replaced usage of deprecated buttons with newer buttons, see #84.