Sidebar tweaks

Trying to fix whitespace issues, mostly unsuccessfully.  Oh well.