Work cleaning up the sidebar