Less clean up
Improved sidebar layout