improve buttons and sortable handler