add some responsiveness, replace old index