Enhance index and connect views