Add pluralisation for statistics
Store settings in database
Fix settings for tests