Fix #7 - index view