new map layout
restructure