commit sidebar for the eleventh time
Merge branch 'ui'