Home view completed
merge