Refactor of sidebar - no more JS
Merged conflicts