Updated Home View
fixed merge conflict