made annotations in list view easier to view
Merge remote-tracking branch 'upstream/master'
misc updates
Merge remote-tracking branch 'brodieaustin/master'