final button fixes