Merging maptap and sadtp into layout
Refactoring layout