Added view changes.
fix merge conflict
Removed images