UPDATED refactored code and homepage layout.