Update/reorganize Status section