Revert to .container-fluid from .wrap.
Move collapse class to sidebar parent div.