Photo viewer style fix
Merge branch 'dev'