rerender
Merge remote-tracking branch 'origin/alexandra.vilcan/sidebarViewv1.0'