Final self diagnose screen
Fixes to self diagnose screen