[D50][Refactor] (CP,BJ) Removed Button