Merge UI changes to mainline.
Move sheet music code to match new UI architecture.