sidebar styled
Merge branch 'bug/fix-modals'