Toolbar and debug window improvements