Second Attempt at cleaning up Sidebar.