Add auto-sync to settings menu & cleanup