Another pass: complete rewrite of right sidebar