Cleaned up index view