Move cfr titles into settings
Make the flow a bit clearer