Added index layout. Other cool stuff.