some of backend design
Merge remote-tracking branch 'upstream/master'
Sidebar fix.