Cleaned up index layout