Separated GLSurfaceView and Renderer and added AnnotationDialog.