Change to UI slightly
Sort category stats
Merge branch 'web'