fix build after refactor
fix build after refactor

too much tinkering to give a good comment. it works. and it cleans up pictures.

selbekk/smashnorge,selbekk/smashnorge,selbekk/smashnorge,selbekk/smashnorge