Move addWidgets() to map-make