updated side panel
Merge remote-tracking branch 'upstream/master'
Merge pull request #225 from jkuk/master

updated side panel