Fixed status bug main edit screen.
Merge branch 'my'