Edit button fixes - sbp support