Fix: improve layout of status badges