Public image view (hack)
Minor edit
Fixed merge conflict
More work in progres...