Make actionButton action less; fix bug