Added more features and colors to map