Layout improvements to map. Next need to hook it up to the right data, and find out why highlighting isn't working.