Improve extra static buttons in datagrid and fix order