Changed display logic
Repaired statuses in view dialog
Fixes status display