Styling things up a little more, adding rising/falling behavior, label toggle button
Merge remote-tracking branch 'upstream/master'