some stuff
css for homepage
fix merge conflicts