Fix sidebar
Merge branch 'develop'

* develop:
  Fix sidebar
Fix some coding standars
Merge branch 'develop'

* develop:
  Fix some coding standars