moved calc and map from layout
merge