Minor cleanup on subject view
Better annotations view