style changes
fixed side buttons
Merge remote-tracking branch 'ouzy/master'

* ouzy/master:
  fixed side buttons
  style changes