Cleaned up Annotator.java and redid how buttons are sorted in
preparation for adding additional sorting methods