Map styling

paige's changes plus merge conflicts resovled