Optimalized map
Fixed map positions