yellow annotations
style fixes
Merge branch 'shana_playground' of https://github.com/ralphma/MappedIn into ralph_master
Linked up refresh button and fixed NPE