new changes
index page clean up
fixed conflicts