View/Edit mode fixes
Merge branch 'master' of github.com:superlopuh/www