Improved sidebar, but not finished