Refactoring of homepage, implementing from_us