Added percentages to Map pie charts. + code clean up

Closes #151