view refactor
use Map instead of StringMap everywhere…