buttons + additional changes