#41 Improved sidebar layout