Add settings for auto start & activity recognition
Some improvements