Better settings organisation, cleaner 404