Fix homepage feature, a bit
Cleaned conflicts