Added logic for snowy mountains in water map, made a few minor UX enhancements
Merge branch 'develop'