fix #38 and fix #39 - component sidebar