home page layout fix
fix merge conflicts