Added Maps + working on fonts