Bug #1222698 fix and other note styling fixes