More work on refactor
Merge branch 'webview' of github.com:CrowdDJ/player into webview
Enough work for one night