Fix: Highlight 'Now playing' menu item

Closes #31
Various minor updates