Style Edit

Filters have been floated to the right
Merge remote-tracking branch 'origin/Jay'