70216700 refactor homepage master