updated css features
mergin index.html conflict