Dv switch UI space removal changes