[#43507091] Fixed merge conflicts
Merge pull request #42 from loganbfisher/43507091_add_user_facing_features_to_homepage

[#43507091] Fixed merge conflicts