Working on profile settings
Fixed minor problem
Merge remote-tracking branch 'origin/Leon-Ho'