moved setting action out of the menu to always visible.
Merge remote-tracking branch 'origin/master'