cleaned up index layout