Added more buttons and a separator (untested shorthand).