Some UI fixes related to the debug/nondebug alignment