Fixed a problem with the mode labels

Mode labels were using a modulus to deal with the octave switch.  This
was causing problems so I hacked a short term fix in.