Added label support
Simplified Annotation table view of inspector
cleaned up a little more