revert previous patch and move sidebar back to its original location