Misc fixes

Just a few nits and a return of the toolbar button, as it's useful for quick debugging against desktop browsers.