sidebar edits
Merge branch 'sidebar' into awesome-time

* sidebar:
  sidebar edits