Fix Settings FC and cleanup a little