Show/Hide buttons added for content and menus
Merge remote-tracking branch 'origin/master' into UnixCommandFix