Moved some of the sidebar stuff around