Updated sidebars
Fixed shortcodes