New Style and show and hide button
Merge remote-tracking branch 'origin/master'