CBU

Previous design flaw fixed. Continuing work on hard-coding icons to
certain menu items.
Merge branch 'master' of https://github.com/allenvanderlinde/Songbird