[Badge view] mostly visual fixing arround badges