Layout for new debug console.
Last ugly style guide compliance fixes
Fix nasty retry bug that causes us to not reconnect.