Map + UI changes

Sweeping map + ui changes, groundwork for inventory system