Remade adding buttons logic