Tidy map

**Before:**
![image](https://cloud.githubusercontent.com/assets/1238468/5425275/27132296-8308-11e4-88ad-ccaacc43ec6e.png)

**After:**
![image](https://cloud.githubusercontent.com/assets/1238468/5425273/195f9a1c-8308-11e4-99a9-f6830c194f25.png)