fix homepage styling for kevin
fix merge conflict