Maps fixed and xml refactor