Updating of sidebar and fix it's bug.
Solve conflicts