Added new button and fixed numbering