Major Homepage change, carousel update
Merge conflict resolution