Refactoring of homepage

1 job for develop
in 1 minute and 10 seconds and was queued for 2 seconds