Add span tag while enabling or disbling apps as well.