homepage is functional now
merged without any difficulty