Merging maptap and sadtp into layout