adjusted side panel
Merge origin/master