Updated folding & sidebar to work together better