Button: Move buttonMarkup into its own entry. Fixes #85.