Views fixes, picture refactoring...

and other imporvements/bug fixes.