Fix bug #18

Updates mode switcher labels and the mass label