ViewModels Added, few left. Views code modified.