Feature/show unit count