Feature/bb refaktor/marleene text changes