More UI Fixes, Now dynamically calls map class