Merge pull request #508 from RotaruDan/viewsFixes

Views fixes
first aproach to picture integration