Added wrapper to correct floating sidebar.
Fixed merge conflict fo sidebar wrapper.