Improve index view