Buttons Config improved