added personalized settings
Merging all changes