Clean Up
Fix Settings FC