Fixed legend bug, minor changes
Merge pull request #130 from jehope/adminMods-3

Fixed legend bug, minor changes