Reverting ui. change, it doesn't work after all (but uniformizing the way status entries are written)