8b58736 Iteration on sidebar and other fixes