More progress on sidebar