refactor index view
resolved conflicts