Add a wrapper and clean up the view for the sidebar