ordering is display level stuff, put it in interface instead
Merge branch 'v7.1' of git://github.com/phpwax/wildfire into v7.1