Refactored homepage into single module