Various debug ui fixes and enhancements
Merge pull request #4372 from Kingcom/DebugFixes

Various debug UI fixes and enhancements