task 180: improve mvvm usage
task: 180 improve mvvm usage
task 165 edit image icon
Merge TFS Changeset 400