#102 fixed right menu buttons (which lead to a horizontal scrollbar)
Merge remote-tracking branch 'origin/master'