Artist view

Lots of fixes for artists view
Fixes #26