Portet map portal to the new layout
Ported map portal to the new layout
remove obsolete header file