sidebars and shortcodes

Cleaning up sidebars and shortcodes. Gettin' warmer.