Better index view. First part of #81