Fixed Location in MAp and Settings and added new Db to Settings