Small performance tweaks
Merge branch 'master' of github.com:SoSACrp/AthenaVisualizer into gh-pages