Moved status badges around