Moving status badges to make layout neater