added styling to index
fixed conflicts