Displaying status correctly #211 #203