added IoC
update files
updated files
update Views and logic flows