Updated map flow & Added opacity