Factor some common functions into InstrumentPanel
Fleshing out the wave panel